Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #960, add socket shutdown implementation #976

Merged

Conversation

jphickey
Copy link
Contributor

Describe the contribution
Adds an OS_SocketShutdown() wrapper around the BSD socket shutdown() API. This allows a data transfer of a stream socket to be gracefully shut down prior to socket closure.

Fixes #960

Testing performed
Build and sanity check CFE, run all unit tests
The "network-api-test" program is enhanced with several more test cases to confirm that the shutdown functionality is working as intended.

Expected behavior changes
OS_SocketShutdown() API added. No effect unless API is used, existing code not changed.

System(s) tested on
Ubuntu 20.04, RTEMS 4.11

Additional context
This PR depends on PR #971, so this is based on the IC right now.

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

@jphickey jphickey linked an issue Apr 28, 2021 that may be closed by this pull request
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Apr 28, 2021
@skliper
Copy link
Contributor

skliper commented Apr 28, 2021

Ping @excaliburtb

@astrogeco astrogeco added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Apr 28, 2021
@astrogeco
Copy link
Contributor

CCB:2021-04-28 APPROVED

Adds an OS_SocketShutdown() wrapper around the BSD socket shutdown() API.
This allows a data transfer of a stream socket to be gracefully shut
down prior to socket closure.
@jphickey
Copy link
Contributor Author

Rebased/pushed again to resolve some code coverage issues. This looks OK now.

@jphickey jphickey closed this Apr 29, 2021
@jphickey jphickey deleted the fix-960-socket-shutdown branch April 29, 2021 13:21
@jphickey jphickey restored the fix-960-socket-shutdown branch April 29, 2021 17:17
@jphickey jphickey reopened this Apr 29, 2021
@jphickey
Copy link
Contributor Author

The branch was deleted by mistake, this is still needing merge

@astrogeco astrogeco merged commit 55ab09e into nasa:integration-candidate May 3, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request May 5, 2021
nasa/osal#973, UtPrintx function
nasa/osal#976, add socket shutdown implementation
astrogeco added a commit to nasa/cFS that referenced this pull request May 5, 2021
cfe v6.8.0-rc1+dev559 and osal v5.1.0-rc1+dev417

Combines:

nasa/osal#979
nasa/cFE#1481

Includes:

nasa/osal#973, UtPrintx function
nasa/osal#976, add socket shutdown implementation

nasa/cFE#1418, add ES CDS Functional test
nasa/cFE#1429, Function comment blocks
nasa/cFE#1414, Add Header Functional tests.
nasa/cFE#1415, add Current Time Functional Test
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
@jphickey jphickey deleted the fix-960-socket-shutdown branch February 24, 2022 13:47
jphickey added a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Keep names under 16 chars to make more debugger friendly, regardless
of the OSAL limit.
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add socket shutdown API
3 participants